From: Michael Albinus <michael.albinus@gmx.de>
Date: Wed, 5 Dec 2012 10:09:54 +0000 (+0100)
Subject: * net/tramp-adb.el (tramp-adb-sdk-dir, tramp-adb-prompt): Use
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~844^2~9^2~55
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=51b890acbf62bb3b9c10c025413786d69f6c87d4;p=emacs.git

* net/tramp-adb.el (tramp-adb-sdk-dir, tramp-adb-prompt): Use
group `tramp'.  Add version.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b6f03d4a5d3..42cd1dca308 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-12-05  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/tramp-adb.el (tramp-adb-sdk-dir, tramp-adb-prompt): Use
+	group `tramp'.  Add version.
+
 2012-12-05  Chong Yidong  <cyd@gnu.org>
 
 	* ffap.el (ffap-url-regexp): Don't require matching at front of
diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el
index a56ccd98e47..3a2500bb5c7 100644
--- a/lisp/net/tramp-adb.el
+++ b/lisp/net/tramp-adb.el
@@ -39,16 +39,18 @@
 (defcustom tramp-adb-sdk-dir "~/Android/sdk"
   "Set to the directory containing the Android SDK."
   :type 'string
-  :group 'tramp-adb)
+  :version "24.4"
+  :group 'tramp)
 
 ;;;###tramp-autoload
 (defconst tramp-adb-method "adb"
   "*When this method name is used, forward all calls to Android Debug Bridge.")
 
 (defcustom tramp-adb-prompt "^\\(?:[[:alnum:]]*@[[:alnum:]]*[^#\\$]*\\)?[#\\$][[:space:]]"
-  "Regexp used as prompt in ADB shell."
+  "Regexp used as prompt in almquist shell."
   :type 'string
-  :group 'tramp-adb)
+  :version "24.4"
+  :group 'tramp)
 
 (defconst tramp-adb-ls-date-regexp "[[:space:]][0-9]\\{4\\}-[0-9][0-9]-[0-9][0-9][[:space:]][0-9][0-9]:[0-9][0-9][[:space:]]")